Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Thu, 7 Dec 2006 13:18:08 +0000 (13:18 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Thu, 7 Dec 2006 13:18:08 +0000 (13:18 +0000)

Trivial merge